Resolve Merge Conflicts Github